Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adapt NGFS to NPi structure, add integratedDamageCosts script #1445

Merged
merged 2 commits into from
Oct 30, 2023
Merged

adapt NGFS to NPi structure, add integratedDamageCosts script #1445

merged 2 commits into from
Oct 30, 2023

Conversation

orichters
Copy link
Contributor

@orichters orichters commented Oct 26, 2023 •
edited
Loading

Purpose of this PR

  • add integratedDamageCosts script that we use for NGFS

  • adjust NGFS config

  • coupled config: Misko suggested to move away to rcp4p5, the rest is cosmetics.

File comparison: /p/projects/rd3mod/github/repos/remindmodel/remind/develop/config/scenario_config_coupled_NGFS_v4.csv -> config/scenario_config_coupled_NGFS_v4.csv
Columns deleted: -
Columns added:   -
Renamed columns: -
Renamed rows:    -

Changes in the scenarios:
~ SSP2-Base_d50:
    start: d50 -> 0
~ SSP2-Base_d95:
    start: d95 -> 0
~ SSP2-Base_d50high:
    start: d50high -> 0
~ SSP2-Base_d95high:
    start: d95high -> 0
~ h_cpol_d50:
    magpie_scen: SSP2EU|NPI|cc|rcp6p0 -> SSP2EU|NPI|cc|rcp4p5
~ h_cpol_d95:
    magpie_scen: SSP2EU|NPI|cc|rcp6p0 -> SSP2EU|NPI|cc|rcp4p5
~ h_cpol_d50high:
    magpie_scen: SSP2EU|NPI|cc|rcp6p0 -> SSP2EU|NPI|cc|rcp4p5
~ h_cpol_d95high:
    magpie_scen: SSP2EU|NPI|cc|rcp6p0 -> SSP2EU|NPI|cc|rcp4p5
- h_ndc_preUkraine was deleted.

normal config

  • finalize use of "NDC after NPi`
  • adjust transport mix in h_cpol
  • add regipol bioenergy limits to limit BECCS to 5Gt/yr
  • adjust to the o_lowdem and o_2c settings we actually used
File comparison: /p/projects/rd3mod/github/repos/remindmodel/remind/develop/config/scenario_config_NGFS_v4.csv -> config/scenario_config_NGFS_v4.csv
Columns deleted: -
Columns added:   cm_implicitQttyTarget, regipol
Renamed columns: -
Renamed rows:    -

Changes in the scenarios:
~ SSP2-Base_d50:
    path_gdx_refpolicycost: SSP2-Base -> NA
~ SSP2-Base_d95:
    path_gdx_refpolicycost: SSP2-Base -> NA
~ SSP2-Base_d50high:
    path_gdx_refpolicycost: SSP2-Base -> NA
~ SSP2-Base_d95high:
    path_gdx_refpolicycost: SSP2-Base -> NA
~ h_cpol:
    copyConfigFrom: h_ndc -> SSP2-Base
    cm_EDGEtr_scen: Mix3 -> Mix2 (default: Mix1)
    cm_startyear: 2005 -> 2025 (default: 2005)
    path_gdx_refpolicycost: SSP2-Base -> NA
~ h_ndc:
    copyConfigFrom: h_ndc_preUkraine -> h_cpol
    path_gdx_bau: h_cpol -> SSP2-Base
~ o_1p5c:
    copyConfigFrom: h_ndc -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_lowdem:
    cm_taxCO2inc_after_peakBudgYr: 6 -> 1 (default: 0)
    description: was changed
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 3800, 2080.GLO.tax.t.CCS.biomass 3800 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_2c:
    copyConfigFrom: h_ndc -> h_cpol
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
~ d_delfrag:
    copyConfigFrom: h_ndc -> h_cpol
~ d_rap:
    copyConfigFrom: h_ndc -> h_cpol
~ h_cpol_d50:
    start: 0 -> d50
    cm_EDGEtr_scen: Mix3 -> Mix2 (default: Mix1)
    cm_startyear: 2005 -> 2025 (default: 2005)
    path_gdx_refpolicycost: h_cpol -> h_cpol_d50
~ h_cpol_d95:
    start: 0 -> d95
    cm_EDGEtr_scen: Mix3 -> Mix2 (default: Mix1)
    cm_startyear: 2005 -> 2025 (default: 2005)
    path_gdx_refpolicycost: h_cpol -> h_cpol_d95
~ h_cpol_d50high:
    cm_EDGEtr_scen: Mix3 -> Mix2 (default: Mix1)
    cm_startyear: 2005 -> 2025 (default: 2005)
    path_gdx_refpolicycost: h_cpol -> h_cpol_d50high
~ h_cpol_d95high:
    cm_EDGEtr_scen: Mix3 -> Mix2 (default: Mix1)
    cm_startyear: 2005 -> 2025 (default: 2005)
    path_gdx_refpolicycost: h_cpol -> h_cpol_d95high
~ h_ndc_d50:
    start: 0 -> d50
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_bau: h_cpol -> SSP2-Base
~ h_ndc_d95:
    start: 0 -> d95
    path_gdx_ref: h_cpol_d95 -> h_cpol
    path_gdx_bau: h_cpol -> SSP2-Base
~ h_ndc_d50high:
    path_gdx_ref: h_cpol_d50high -> h_cpol
    path_gdx_bau: h_cpol -> SSP2-Base
~ h_ndc_d95high:
    path_gdx_ref: h_cpol_d95high -> h_cpol
    path_gdx_bau: h_cpol -> SSP2-Base
~ o_1p5c_d50:
    start: 0 -> d50
    path_gdx_ref: h_cpol_d50 -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_1p5c_d95:
    start: 0 -> d95
    path_gdx_ref: h_cpol_d95 -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_1p5c_d50high:
    path_gdx_ref: h_cpol_d50high -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_1p5c_d95high:
    path_gdx_ref: h_cpol_d95high -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_1p5c_d50_cpricereg:
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50 -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_1p5c_d95_cpricereg:
    path_gdx_ref: h_cpol_d95 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d95 -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_1p5c_dni50:
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50 -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
~ o_1p5c_dni95:
    path_gdx_ref: h_cpol_d95 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d95 -> h_cpol
    cm_implicitQttyTarget: off -> 2060.GLO.tax.t.CCS.biomass 4300, 2080.GLO.tax.t.CCS.biomass 4300 (default: off)
    regipol: none -> regiCarbonPrice (default: none)
+ o_lowdem_d50 was added.
+ o_lowdem_d95 was added.
+ o_lowdem_d50high was added.
+ o_lowdem_d95high was added.
~ o_2c_d50:
    start: 0 -> d50
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d50 -> h_cpol
~ o_2c_d95:
    start: 0 -> d95
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d95 -> h_cpol
~ o_2c_d50high:
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d50high -> h_cpol
    description: was changed
~ o_2c_d95high:
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    cm_taxCO2inc_after_peakBudgYr: 3 -> 1 (default: 0)
    path_gdx_ref: h_cpol_d95high -> h_cpol
    description: was changed
~ o_2c_d50_cpricereg:
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50 -> h_cpol
~ o_2c_d95_cpricereg:
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d95 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d95 -> h_cpol
~ o_2c_dni50:
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50 -> h_cpol
~ o_2c_dni50_fixCprice:
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50 -> h_cpol
~ o_2c_fixCprice:
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50 -> h_cpol
~ o_2c_dni95:
    carbonpriceRegi: none -> netZero (default: none)
    cm_netZeroScen: NGFS_v4 -> NGFS_v4_20pc (default: NGFS_v4)
    path_gdx_ref: h_cpol_d95 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d95 -> h_cpol
~ d_delfrag_d50:
    start: 0 -> d50
    path_gdx_ref: h_cpol_d50 -> h_cpol
~ d_delfrag_d95:
    start: 0 -> d95
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50 -> h_cpol_d95
~ d_delfrag_d50high:
    path_gdx_ref: h_cpol_d50high -> h_cpol
~ d_delfrag_d95high:
    path_gdx_ref: h_cpol_d50high -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50high -> h_cpol_d95high
+ d_strain_d50 was added.
+ d_strain_d95 was added.
+ d_strain_d50high was added.
+ d_strain_d95high was added.
~ d_rap_d50:
    start: 0 -> d50
    path_gdx_ref: h_cpol_d50 -> h_cpol
~ d_rap_d95:
    start: 0 -> d95
    path_gdx_ref: h_cpol_d50 -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50 -> h_cpol_d95
~ d_rap_d50high:
    path_gdx_ref: h_cpol_d50high -> h_cpol
~ d_rap_d95high:
    path_gdx_ref: h_cpol_d50high -> h_cpol
    path_gdx_refpolicycost: h_cpol_d50high -> h_cpol_d95high
~ o_cba_d50:
    start: 0 -> d50
    path_gdx_ref: h_cpol_d50 -> h_cpol
~ o_cba_d95:
    start: 0 -> d95
    path_gdx_ref: h_cpol_d95 -> h_cpol
~ o_cba_d50high:
    path_gdx_ref: h_cpol_d50high -> h_cpol
~ o_cba_d95high:
    path_gdx_ref: h_cpol_d95high -> h_cpol
- h_ndc_preUkraine was deleted.
- o_1p5c_fix_postUkr was deleted.
- o_1p5c_46NDC was deleted.
- o_2c_netZero20p was deleted.
- d_delfrag_netZero20p was deleted.
- d_delfrag_ccs2 was deleted.
- d_delfrag_46NDC was deleted.

Type of change

  • New feature
  • Scenario update

Checklist:

  • My code follows the coding etiquette
  • I performed a self-review of my own code
  • I explained my changes within the PR, particularly in hard-to-understand areas
  • All automated model tests pass (FAIL 0 in the output of make test)
  • The changelog CHANGELOG.md has been updated correctly

pweigmann
pweigmann approved these changes Oct 27, 2023
View reviewed changes
Copy link
Contributor

@pweigmann pweigmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cannot say much about the content of the changes, but from the more technical perspective it looks fine for me.

@orichters orichters merged commit 29cd9e5 into remindmodel:develop Oct 30, 2023
0 of 2 checks passed
@orichters orichters deleted the NGFS_d3 branch January 31, 2024 11:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpiontek fpiontek fpiontek approved these changes

@pweigmann pweigmann pweigmann approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@orichters @pweigmann @fpiontek